libfsimage: Revert broken parts of portability changes to the build system.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/libfsimage/Makefile b/tools/libfsimage/Makefile
index b72e51895a6084efcd1c75d030c61c656a520341..7dd3c4f0fb04f5d754b6c4ade76ef09b98cc4a16 100644 (file)
--- a/tools/libfsimage/Makefile
+++ b/tools/libfsimage/Makefile
@@ -2,7 +2,7 @@ XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y = common ufs reiserfs iso9660 fat
-SUBDIRS-y += $(shell $(SHELL) env CC="$(CC)" ./check-libext2fs)
+SUBDIRS-y += $(shell env CC="$(CC)" ./check-libext2fs)
 
 .PHONY: all clean install
 all clean install: %: subdirs-%

diff --git a/tools/libfsimage/check-libext2fs b/tools/libfsimage/check-libext2fs
index b6fa7fbacd6492b2ec1c4d2904f08fddeb9f6bf1..3c79fb055357aad0f1fd11fc644046aadcee12db 100755 (executable)
--- a/tools/libfsimage/check-libext2fs
+++ b/tools/libfsimage/check-libext2fs
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 cat >ext2-test.c <<EOF
 #include <ext2fs/ext2fs.h>
@@ -9,9 +9,7 @@ int main()
 }
 EOF
 
-if test -z ${CC}; then CC="gcc"; fi
-${CC} -o ext2-test ext2-test.c -lext2fs >/dev/null 2>&1
-
+${CC-gcc} -o ext2-test ext2-test.c -lext2fs >/dev/null 2>&1
 if [ $? = 0 ]; then
        echo ext2fs-lib
 else